(font_prop_validate): Make nil a valid value.

diff --git a/src/ChangeLog b/src/ChangeLog
index ed2059ebd378dc1b2248d182f24c1919d205844d..223356eaad22795033b3ea21487fddd3dbe1bb05 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-14  Kenichi Handa  <handa@m17n.org>
+
+       * font.c (font_prop_validate): Make nil a valid value.
+
 2008-05-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * emacs.c (main_thread): Conditionalize on

diff --git a/src/font.c b/src/font.c
index 07bd9a2af2e00fe8a7ecae2175b65043b505d342..c5cf732bfe90badbbb1b7eb5f9de110c278e9cec 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -566,6 +566,8 @@ font_prop_validate (idx, prop, val)
 {
   Lisp_Object validated;
 
+  if (NILP (val))
+    return val;
   if (NILP (prop))
     prop = *font_property_table[idx].key;
   else